Merge tag 'upstream/2016.14' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 29 Nov 2016 01:10:36 +0000 (01:10 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 29 Nov 2016 01:10:36 +0000 (01:10 +0000)
commit741ac33356f733be19c654d0c640ff828104bdc6
tree2858860972ad0a83988916064aacaa6c6e192be0
parente7b52cea111c18842d44bf0d1fc33f92370575a2
parent90f43fba94d91ee67d9c795637f795340bac3605
Merge tag 'upstream/2016.14' into debian/master

Upstream version 2016.14